From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 10 Jan 2007 15:28:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~2890
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a3d77410f9ec3a769d17311b0c7f826f8c0469ef;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d843e319500..96b69931540 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* ediff-init.el (ediff-autostore-merges):
+	* textmodes/fill.el (fill-region): Doc fix.
+
 2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* server.el (server-ensure-safe-dir): UIDs may be floats.